Small changes to get towards dynamic dispatch.