CI and other modifier improvements

These were picked over from the larger basic physics commit. I don't want
to hold up better modifier stuff while waiting on more physics code.