clean up operator definitions a bit