MessageDirector: Clean-up range logic.
This commit only fails the range unit test.
This is expected: the upstream logic on remove_range needs to be rewritten (find #TASK in the file).