AST Cleanup. Fixes #47 and #41.

Two small cleanups. Hope you don't mind I did them together.