Optional short string optimization, miscellaneous improvements.