expression: bring back as Blocks and expressions
if-else: update to reflect previous chapter on expressions and blocks