Magnar provided more overrides. No more defadvice!