Minor refactor; did SplitAfter()