Some style system progress.

Some progress on #1006 and #1057.