Minor edit to start conversion to typedef byte