Item unification part two: use enum
Merge branch 'master' into wip

Conflicts:
	visit.rs
wip