I don't see ADVANCED_TIMERS being redefined anywhere else.  TIM1_BASE isn't defined in the L1 memory map, how does this work?  (Or was that trick fixed elsewhere, and this is just removing the evidence?)