return None for piecewise if not small definite

Some minor suggestions in reordering code. I would prefer to keep the definite handling all in one place.