A few minor changes, mostly for working with web-mode.