Re-ordered charm target checks so they make more sense and work better.