#554: work on typemaps