Move a guard to its correct position and refine a placeholder-function-name