Consolidate all parsing in psci into one parsec parser