Simplify CompUnit construction