Oops -- API changes needed to go along with impl changes.  Fixes #2186