Re-introduce some partial calculation optimizations I'd previously ripped out for API parsimony.