Removed wrapping with Some() via <ofp-add-some>
Unwrapped opt-*() from EntityDecls.
Removed extraneous AllocOpt handling.
Simplified TypeDeclarationStmt