WIP: Make syntax even easier.

Change-Id: If56deb8c85741bdf6b377343d4ecfbb3bc4a1be2