simplification.
Merge branch 'type_names'

Conflicts:
	src/.sconsign.dblite
	src/nxt.c