PLINK-130 slight refactor of annotations, add missing source headers