Use subplots in examples (rebase)

A rebase of #1598, so @ivanov's hard work doesn't go to waste.