Express lambdas and semi-colons where appropriate