Relaxed type similarity requirements.  Small refactor of testing logic.