Group source declarations by mark comments

Fixes #61. @segiddins anything you'd do differently?
Agreed and changed.