strictifying keys to narrow performance gap a bit