Style changes and #326.