Can't remove lvalue completely until we've audited the code