Moar refactoring in advance of building instance-binding-map

R=arv
BUG=

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