Convert (when possible) macros into functions when called recursively

[GuillaumeGomez]

This is a potential follow-up of #299. When possible, we could greatly improve the situation (and lift this restriction) by converting macros into functions when necessary.