Revert "Considerably simplify all time annotators."

This reverts commit 01c3e50ef08b5064dd3033520e21f885bf58ae58.