Mask the partition flags correctly (d'oh). Also, don't report entries during the unallocated pass, which was doubly-reporting entries.