Adopt comma-first style of require declarations
Add format tests, rewrite format parsers