Further work on moods (#39)

Just a helper commit.