Fix #24 change to typemap API