I _think_ this fixes my issue with namespaced model classes.  Need to
put together a reproducible test that shows failure - and then set up
issue for it in master.