[#585, #1543, #212] Adds to evolutions spec, removes from comments.