Fix more scoping issues (module vs class etc).