Revisit handling of None as part of identity structure

[eywalker]

After the latest PR#76, None found in identity structure is dropped from consideration. Revisit this handling

Originally posted by @eywalker in #76 (comment)