Clean up inflections & prototype extensions