Optimizing: Create fewer handles in inliner. am: 5a62af5dc9

Change-Id: I05eed8cab6fa1c976db7c3b2c6b782a5a839ba39