#4: Some minor improvements.