Unify presentation of bit mask and named integer strings.

```
BUILD SUCCESSFUL

Total time: 41.224 secs
```
I had that originally but split them up because they diverged too far. You'd never use `getNameOrValue` on a bitmask nor need to have code that handles a common type. They're always just used as one-off builders.