[Fix #47] Clean up external interface.