Moved more contextual logic into syllabification context.