Merge in changes from vtjnash @syms, others, no pytype_mapping