Correct commit

The previous commit was in error. It is this version than has been
tested. The clumsy code has been replaced and configurable syntax added.