- More tiny cleanups while reading through new code.