D'oh. Didn't handle the '--fs' argument. TODO: Write test cases for this, since we had this problem before..