Add a fast-fail path, formatting fixups