Proper fix for the annoying through-mode depth issues.