Minor style fixes: fix-warnings branch.