Refactor: TODO items
When making changes to Zoph, sometimes there are things that are not as they are supposed to be, but are left in place to ensure support for an older PHP version, wait for some other code to be changed or simply because making too many changes at the same time, bugs are more likely. Whenever possible, that code is marked with a 'TODO' indicator. It's time to go over them and see if it's possible to remove (some of) them.