conditionally include kind variables