Update bitmasks to work differently

I decided that just using a bitwise NOT makes more sense than what I was
originally doing. So I removed the duplication.