Simplify API for nodes that have both a block and an expression.
Update tests.