More SWIG type fixes.