Reworked how computeds are handled.