Additional index support in driver-compat, plus tests for the gaps I know exist