Code review tweaks.