Missed return, minor enhancements in types.base.