Refinements to the previously-posted commit.
May be excessive or unnecessary.