Add missing mutable.
Remove rvalue ref qualifiers to match proposal text.
Add comparison operators.