Switch to _mut suffix functions (RFC 52)