Working on better type/constant lookup