[sr-dev] git:master:f0f6269a: dispatcher: compacted code and declare variables at beginning of functions