Minor syntax improvements, making use of groovy features.