Check if field is of same type as parent when expanding ModelAttribute

To avoid StackOverflowError when expanding ModelAttributes,
skip call to `expand` when a treeish field is encountered. #465
I thing we should log a warning that the inner field type is not being expanded, rather than just silently skipping it.