Move "return" higher up widget factory method.