Normalize (ns) macros to use keywords for clauses