Changes to try to make gold mention boundaries work