More stuff has the Z-prefix stripped.