This changes the method signature, which breaks existing code and may have caused some test failures. Perhaps the indirected class field could be added to the `options` hash?