Marginally better version of dynamic type resolution