Support af and sp registers in macro arguments
Do some minor work on expansion macro support