Minor refactors to `omit`
Add `pick`