Language list speed improvements, part 2

Continuation of #97. Rebased, not tested.