Clean up of methods in the syntax options lib