Polished NEI handlers a bit.