Minor clean up
If never resolves elseNext, close #1136
Refactor doIfOrElse(String, String), close #1137