More library DSTification

r? @aturon 
cc #16918
Stray `'a` here.