Just *another* small cleanup commit.