Refactor (separator, line) chtype management to use 'fillers'