Some tweaks to the guide for the benefit of the criss-cross docs, and hopefully others as well.