Refactor map_through methods. and...

Some[nil] should be None