some basic cleanup with a factoring of expressions into _flow and _inline variants... -sai