Minor opclass-wise function re-ordering for GIN
Fix GiST key/element bug too