[trunk] Fixing regressions in ex_nucmass, updating for 916.