Refactor UnderMybrella's PR

For consistency's sake, really.  Still some left to confirm and do when I get home (Cobalt/Ardite variables, for one).