Slight simplification of type application inside macro.