Fixes for test-all: Add None for unused extra keys, couple bounds variables.