Intermediate merge from in-memory database feature branch to get rid of
annoying ArrayList vs TreeSet homework conflict.