A few tweaks to the keyword selection code.