Consistent handling of element options applied to alternatives

Fixes #542