@jglick 
I've also left <code>@CheckForNull</code> for  <code>nullify</code> and <code>fixEmptyAndTrim</code>, because they just reuse the <code>fixEmpty</code> method