methods taking blocks and arguments now have proper commas; refactor on_send