Correctly set Modulo annotations for multi-Image datasets

See gh-874.  This allows each Image to have its own ModuloZ/ModuloC/ModuloT.

/cc @imunro