PARTIAL: Made things uglier to accommodate antique editors.