Remove some at-pointers that are not actually needed. (Selector matching)