Having the return shapetype be checked with the :post map
Merge from master
Fixing a merge issue
Finishing the multi definition signature parsing