Fixes #70 by using an obvious TreeMap