Fix regex to match what could be new syntax.  Fix some lint warnings.