Fixed missing cleanup of 'return:' attributes.