[WIP] Capture as many linter auto-fix re-reference cases as possible

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti