Getting rid of even more Shocky args