Simplify, rearrange a bit, and fix some bugs
Simplify, rearrange a bit, and fix some bugs

This was quite a session of back-and-forth.  It might be possible to
split it up into simpler commits, but I've got better things to do with
my time at the moment.

google/bluesky-watchface,google/bluesky-watchface,google/bluesky-watchface