Cleanup: split macro argument parser into a small functions.
Untabify.