Move more functionality into WCS base classes when possible.
(#364)