Various code-example tidyups: #222 #223