Fixes a bug with handling of Option's of primitives, and adds a test