INTERNAL: very minor re-factoring.