Work on the tutorial, and update xproto.xml to match: