Improve #137 with explicitly nil keys