Revert "Allow expressions of arbitrary type with expect()"

This reverts commit cd95014550038f9ae60ba3ca37fc44e1915d7c0b.