Prior to removing some User methods related to unsetting user input,
this removes 3 calls to those methods. This also introduces a list
of attributes that we consider "secondary emails". The intent of this
refactoring is to improve clarity of intent and reduce entanglement
between logic that is unrelated.