This patch contains a few minor improvements to the framework that I ran
across while working on a new layout model.