More performance tweaks for NREL model.