Refactored vstp Parsing