[PLINK-348] - Code cleanup.