Code cleanup prior to master merge.