Some minor cleaning up [ci skip].
Some work towards writing some sample plugins (#337).