Code clean up.

- Streamlined the internal handling of the watch face variations.