Fixes for parser moving over to use util/text/Region