Remove redundant calls to namespace calculation and revise history.