8019983: Void returns combined with return with expression picked the wrong return type
Reviewed-by: sundar, jlaskey