Fix up bad deps/args slightly more robustly differently