More fiddling with making variables work.