Merge "Clean up profman arg checking"