code cleanup
Shrunk CItem datastructures
Moved one-liners to headers

Also removed redundant ASSERTs. Tweaked the treemap preview in options a
bit.