More tiny cleanups as suggested by kumpera.