Better handling of variables defined in imported components (#112).