Improved the way FPT2VarHomogNontrivial handles certain corner cases.