Improved the way keyword arguments are handled in the init.