Use static fields as mapping keys, doing most of #36