WIP inline variables

Change-Id: I94f3b513fb73d6f8bfee5bd335bb531a3c36441f