Made changes suggested by Chris C. in https://github.com/enthought/enaml/pull/242