Attached is a fresh rebase with only minor cosmetic touch-ups which I wouldlike to go ahead with during this CF.
Peter: does this address the comments you had on translation and codeduplication?
--Daniel Gustafsson