PEP8 make_constants
Add a few more CL extensions