Can you fix indentation so we'd better see what was actually changed?
Also - why aren't we removing the "-o" prefix here, but removing it elsewhere?