Minor polish and cleanup.