LGTM. Let's add tests in a follow-up (#3143091: Add tests for computed fields).