[Fix #682] Place the point after the expanded form when doing macroexpansion