[PLINK-180] - Code cleanup.