Done.

IIRC, @dsaff wanted to stay away from special syntax and DSLs.