Addressed comment: Be lazy about memoization
Moved options out of the ext branch - though it looks like there are still some (not directly related) issues with the serialization.