Reduce the water labels down to just the EP models, since that's where it is

most important and we don't want false positives.

wrappers/python/simtk/openmm/app/internal/amber_file_parser.py

@@ -720,7 +720,7 @@ def readAmberSystem(prmtop_filename=None, prmtop_loader=None, shake=None, gbmode
         system.addParticle(mass)
 
     # Add constraints.
-    isWater = [prmtop.getResidueLabel(i) == ('WAT', 'TP4', 'TP5', 'SPF', 'SPG') for i in range(prmtop.getNumAtoms())]
+    isWater = [prmtop.getResidueLabel(i) == ('WAT', 'TP4', 'TP5') for i in range(prmtop.getNumAtoms())]
     if shake in ('h-bonds', 'all-bonds', 'h-angles'):
         for (iAtom, jAtom, k, rMin) in prmtop.getBondsWithH():
             system.addConstraint(iAtom, jAtom, rMin)