Minor change to the active co-routine management; clean up in the
overloading related code;