Fixed the parser... Again

I’m really getting careless with my parsers. Its mostly overlooked
details about the strings going into them, but I really either need to
stop programming late at night, or get a fuck ton more caffeine in my
system.