Fix recursive macro expansion