some inlining, cosmetics, and more explicit sequencing