Imperfect and incomplete rewrite of 4.1.4.1