@Agrendalath: No need for me to review. You already flagged the one concern I would have (the wacky inheritance tree that these things are in). Please just coordinate with @jristau1984 for the merge as always. Thank you.