Further macro expansion tests + fixes.