Should we add a `if block_given?` here?