Minor cleanup of the new FAN_KICKSTART code. #334