This supercedes id:1476207707-21827-1-git-send-email-marmstrong at google.com with changes steming from Mark's helpful feedback.