Add implementation of expand
Move defclass around, add macroexpansion entry points
Fixes
Fix bad-match condition, export no-input-files condition