Tweak `matchVar`, `removeVar` and `getVars` to catch more vars.
Add `funcDecomp` and `funcNames` to `propWhitelist`.