Minor cleanup from IRC code review