Fix mixed decs and code in custom XS