More work on bidi and contextual forms.