Better and cleaner single-file compilation