Refactor in advance of implementing Custom Syntax getInstanceModel

R=arv
BUG=

Review URL: https://codereview.appspot.com/8816043