Remove implicit globals in Timelines

Continuation of work started in #2183. However, this PR is against dev as I did not this is too risky for a hotfix.
Expected '{' and instead saw 'return'.