Minor API improvements.