By removing this restriction, parse trees seem to be happier

Still commented out rather than removed completely so that it can
be looked into more thoroughly.