Minimal change to look for intent extra and run something if present.