Bug 433500 - Add variables for inner and outer expressions

Change-Id: Id51ec597bb88dd611a68a4053e572bdb71386878
Signed-off-by: Nicolaj Hoess <nicohoess@gmail.com>