elevation and removal of some special-case code that was no longer necessary