Carve off a few bits to store the geometry type

instead of implicitly always treating one component as points
and more than one as lines.

Add constants for metadata types.