implicit conversions return type made explicit, other minors