A couple tiny cleanups, made the parsing much simpler