Consistently switched optional dependencies to scope 'optional'; consistently grouped dependency scopes; minor dependency version updates