INTERNAL: very minor changes to the code.