There are a few components in this file that explicitly repeat the parameters from the macro files. Can you replace those by a reference like this one as well