Committed the latest patch in this review, as I'd not received any negative reviews, and incorporated all of Jon's feedback except the very last note (happy to make that method protected in a separate followup btw).
This commit broke taming of core APIs - I'm working with Jas to get that remedied. I committed as seen here to avoid what was continuing to become a worse merge situation. http://codereview.appspot.com/143046
