Cleaning up some sanity-checking styles.