This cleans up the code and simplifies it.
It also speeds up parsing since the old pb position was incorrect.