Fix quoted keywords
Experiment with more flexible loop macro