Cleanup some of the syses parsing