Expand range literal in normalization. Fixed bug with type lookup in included modules.