Continuing adventures in the saga of using Revision class to separate