Issue #77 - More alert/Oops refactoring.