Optimize overload traversal a tad more