Ok. If we keep adding things though, subclassing the C class might be cleaner than all these monkey patches.