Major cleanup of dead pre-introspection code in functions.