Make completion smarter with static when classname is known