This commit uses both styles.