andylai2

@liutao0913 's answer helped me fix the build errors. There are a few other places where the same substitution needs to be made.