Fixes to closed-form computation.