More NFC leftovers, plus some cleanup

Change-Id: I8994a7c07ae083770d57c05912d498d84e8007b9