Since you're talking about step functions and expectation, the final equation should be framed with a binary parameter in mind: x=0 (no liquidity event occurs), x=1 (liquidity occurs).