Minor regex whitespace optimizations/simplifications.