This is what happens when you change a definition and forget to update the rest of the code, my fault.

Corrected and merged everything in a single commit.