Updated kommandant to more robust v0.5.1. Removed MacroDefinition, replaced with explicit definition loop.