Reapply more accidentally overwritten changes; fix reload error reporting after code reorganization