[PLINK-398] - Code cleanup.