Merge in Joe's changes to these classes (which I am moving into ambra-queue).