Clean up dealing with construct arguments