Bug 918058 - Fix nondefault-on-try handling, r=edmorley

Also simplify the code a bit by relying more on CSS selections.