Add completion of work in progress mistakenly included in 584612d. Fix test string-api-coverage to be warning free.