Small improvements, and a prototype of a "foreach" macro