More refactoring of instance declarations (fixes Trac #2572)