Remove unnecessary duplicate thunk lookups