Simplify the callback methods

We try to simplify down these methods by extracting shared logic into one method that they both call.

In doing this we also remove a protected variant_resolved? method.