Minor API changes

+1 on that one.
Good argument.