Fixes for timelines that are set from with(other){} type blocks; with(self) check also applied when no bracket exists.
Merge branch 'with_timelines_final' into iji_2