Fix some checkstype violations.