Yeah, I suppose we can spare one extra operation per Epochs data reading :)

BTW feel free to check + merge #414 whenever you get a chance.