Fix alignment for macro statement argument list

Fix #61
Fix alignment of generic definer.

Fix #60