Testing for bugs off master for opaque-keys deprecation

This pull request is to identify trouble spots after opaque-keys deprecation.
What counts as "a while"...?  I'd prefer to either remove the TODO or leave it, rather than leaving a comment like this