Simplify overloaded methods.
Work in progress.