Minor cleanup. Minor optimizations. Change Fortune test to use competely dynamic datastructure per update to Issue 134.