Some refactoring to #working.

This is still awkward, but I guess it's a bit better.