More StringBuffer removal.