Correcting some FlyCheck complaints.