Shuffle around some defaultOf methods to be closer to their type definition, per
Sung's suggestion.