Bring the memory output inline with the suggestions in #3465.