Fix all known problems with Alternatives (Issue #18 and more)