Fixes issue 280

Cleans up, adds two overrides, but doesn't change API.