More refactoring to simplify Syndetics logic.