Change the runtime type check guard and clean up cut and paste comments