Cleaned.  No implicit none or blanket use through map2.