Bug 1046518 - [NFC] nfcd code cleanup. r=allstars.chh