Second pass at generalized WCS.