HIVE-7068 More formatting changes, replace unnecessary java regex uses.