*** This patches are for next since they should be sent to David within the next pull request ***
The following three patches simply clean the code by following David's suggestions and more.
Remember: - multiline comment must end with */ on a new line - not compiled-in routines must be faked by means of static functions, not defines
Thanks, Antonio