Ok, let me see about changing this over to use data now. I'll add new commits for this change so it's easier to see in isolation.