Small generators code clean-up.