Some more trivial compiler warning eliminations