Switch loadTypeDetail back to non-DESCRIBE version & some refactoring.