[WIP] Clean up argument order mixup