Oof, too bad about this diff. Maybe we should find a format for this file that doesn't require re-aligning everything whenever we add a long key.