Improvements to auto_get_datatypes running time.
Improvements to auto_get_datatypes running time.

embaldridge/retriever,embaldridge/retriever,goelakash/retriever,bendmorris/retriever,goelakash/retriever,davharris/retriever,henrykironde/deletedret,bendmorris/retriever,henrykironde/deletedret,davharris/retriever,embaldridge/retriever,bendmorris/retriever,davharris/retriever