Clean up documentation to use match syntax for some of the examples