Revert "Swallow **kwargs for easier subclassing"

This reverts commit bd0d76a81e221bec0e43ad2edd65a9cdfd9a5715.