Questionable change from user perspective, but internally needed to implement the next commit. Also useful for testing timeline stuff.
wm4