#1009 Cleaned up typemaps