Make backwards-compatible, remove unnecessary bringing T into scope (done
at top of file)