Enforce held-object geometry and explicit reconciliation

Enforce held-object geometry and explicit reconciliation #149