Library maintenance chores

Please see individual commit messages for details.

Fixes #3117 (closed), #3099 (closed), #3098 (closed), #3097 (closed), #3089 (closed)