Specs: More cleanup around the proposed style model to make things more consistent.

Review URL: https://codereview.chromium.org/805083008