Simplified handling of pseudo image map; minor cleanups.