More compiler suggested cleanups