Some small general cleanup.