Are we moving toward `expect` syntax in this codebase?