Follow up on @simong's API review