As an FYI, I'll remove this and update when the changes mentioned above roll into ADAM.