Cleanup and simplification after review in London sprint
Attempt to fix FTBFS on mips, mipsel, powerpc (Closes: #772964).