- Fix child annotations not inheriting member name, cleanup