Minor geometry API tweaks