Staged hunk, include SqlTypeResolver