More work for porting Config to XS