Updates suggested by @pekrau and @remiolsen..

Thanks for the review everyone! I might ask you to do a big review of all written code when it gets a little more stable.. ;)
Normally, I would object to the use of "import... as...", because in my experience this tends to confuse things. But in this case it looks kind of OK...