Tiny changes to get CodeHint to work on Android.