Addressed latest suggested fixes.