With prefix encoding in mind, these changes make sense to me.