Issue #291: Minor code style update (Part II)