Various very minor fixes.
Don't declare reg names in a header file.