Yet another try to fix 32 bit buildbot
Merge branch 'johanhake/simplify-typemaps-for-la_index' into next