[Improvement] Better resolving of after/before pairs

[keelefi]

Not much thought was given to the resolving of after/before pairs. It is rather simple in that for every after or before, we set the corresponding pair in place. It is very likely that there exists are simpler way of doing this.