A bunch of miscellaneous changes to satisfy lint, to an extent.