BUG:  Masking shouldn't be dependent on a weight image.