simplified expressions, undoing the early exit tests that i added yesterday. best to leave this simple for now, smaller functions in this case may be more likely to be inlined anyway