Some bug fixes for s-expression ASTs