Remove blaze.eval workarounds
Change comment to indicate likely point for fixing remaining visible bug