VIP code review tweaks.