ParseP: Refactor things a bit