Add more comments
ElementBuilder: Simplify control flow
Update to latest Rust