Further parser improvements