simplify path conditions a bit by not having loads of "and true" parts