Sim consumes migration fixes

Collection of consumes migration fixes for many of the SIM-responsible packages.  Passes simple runTheMatrix testing.