Small code review tweaks.