Revision based on new TinyColor patch

All tests still pass.