Much nicer. In next commit.