Reworked some of the examples to make them more minimal.