Conform to protocol as documented - or at least come closer.