Consistent handling of element options applied to alternatives (fixes #542)