Remove the silly overloading, and introduce virtual methods.

Change-Id: If54a6a3fb7464283f80d3387ae23db234690f8a3