Further changes need more context down in the call stack.
Signed-off-by: NFrancois Romieu <romieu@fr.zoreil.com>