Also fix module refcounting for #1764 and remove redundant variable assignment (which just triggers a useless type check).