I've tweaked the test and fixed the addrem -fs support so it really only considers added/removed files. I also redid the logic within addremove so it only builds the helper lists and maps for -s when necessary.