Smaller code cleanups.