Are these only needed for aes.rb? If so, they should stay there IMO.