...though many more remain, as the design appears to be let heap grow
until exit.

Change-Id: I3e5cc95a0896c8add33a767209ab0ff60d6a4b52