Streamline GeometryID interface

The current interface with manual specification of bit masks is not always clear to handle. A more explicit interface would help.

Labeled as major issue since this is change very deep in the code.