Some clean-up before we try this with CAS 4.0.0.