DECL_STMT renamed to DeclStmt and DECL renamed to Decl to be consistent.
More work on steps.