Removing the last traces of is_before_current_term