More work on geometry handling.