Use overrides vs styles
Fix regression introduced in expandToVisibleCharacter()
Handle delete and enter properly