Refactor the receiver classes a bit.