Pruned redundant stdlib interfaces
PSR fix