Minor simplification of past/future swapping code.