Moved comment/advert-handling into include-files.