Moved the `defstmt` macro to another file and fixed a scoping issue with it.