Add back options parameter.

This is mostly to enable workarounds when implementers need to avoid recursion.