Compiler suggested cleanups - Johnny Billquist