More work on EditBox.