Previously, XKB_BINDIR was read inside a loop over the program arguments, so was only read if it had arguments that weren't matched by the first some number of checks.
807a0e4609