Simplified internal parser API
Further simplified internal parser API