Cleans up multi-line masks. Removes un-needed sets
Merge pull request #331 from sudorandom/mask-cleanup

Cleans up multi-line masks. Removes un-needed sets