Get rid of protocol should_close, other cleanup

should_close isn't actually needed... there's no need to try to handle
bad input in the event that we get it