@hjmjohnson: This looks correct - can you see any reason why this was an "or" statement?  I'm going to verify that we have a test using just one mask, and if not, add one.