Merge pull request #1783 from boqwxp/astcc_cleanup