Issue #27: Some code cleanse.