Cleanup and standardize omnibus-software definitions

Yea, that was accidental during testing. Fixed in e36ec6a.