Maybe now handles lvalue-rferences transparently.