Removed 1st class functions - only module functions;  Changed restriction to overload extraction