Fix handling of non-manadatory contacts to do the right thing
OpenSRS, how do I API'd?
Slightly prettier and more concise assignments