Tweaked the nonin to fix the failing device matching test.