Cleanup of SConstruct due to flexibility in Intel/GNU compiler support