Tabs -> spaces, small reformat.
Regex tweaks.