Refactored mutability enforcement