More interface coverage to facilitate testing.