small cleanup in width regex matching. #1557