More work on expressions and statements