Use consistent ordering of types (mirrors enum)

Add vp_short and vp_byte (saves on masking)