Properly round on unmapping.
Move AIC related stuff to own file.