Unbust P1Atom/empty by cutting back its state bits
Fix up busted tests, for non-zero empty type, and padding in UUIDs