Eradicated nested functions
More protocol edge cases