Cosmetic touches for Marco

No functional change.