Switch back to sphinxcontrib-napoleon, figured-out how to make it consolidate multiple parameters and it handles cross-references in parameter types.