@sindrenm suggested we use traits instead, so I did that for `with_verification`. I think we should be consistent, but I don't have a strong preference on whether we use traits or sub-factories. Do you, @sindrenm or @toothfairy?