Ben Gamari authored Oct 26, 2015 and Ben Gamari committed Dec 27, 2015

Otherwise we get a C-- lint error due to mismatched RHS and
variable types.