Fix an conversion warning. Also remove an unnecessary return in a void function.