Fixed fluent interface for new alises "then" and "otherwise"