Refactored so that we get rid of the unnecessary subsumer class.