whitespace cleanup
begin type-based formatting
type-based formatting: tolerate null values in DB
adjust tests to type-based formatting
type-based formatting: u'None' -> empty string