Minor changes for clearer extension libraries (#2818)