Oh; that last mail probably didn't make any sense at all because I managed to miss including multiarchtable in the patch altogether. This should be better. :)