Fixing several issues with the way internal methods are overloaded.