Cleaned up a hack in like()