retro-trail: moved commentary blocks next to matching code blocks