arakoon-368

This should fix arakoon-368, including the behaviour related to None as first.
Let me know what you think.
Jan