Merge "Fix mma/mmma by making gettop canonicalize TOP when set"