I found occurrences of the same problem in numerous other files, so I fixed those too. I think I found them all but let me know if you find anything else. I've updated my branch with the changes. I updated the status to be 'Beta 1b' with a date of 16Mar2017 so you can tell if you have the right "revision".
Sorry, I should have caught that...