Some cleanup-refactoring in the overloaded methods code... got rid of those Object return values everywhere at this point.