Cleanup in prep for refactoring to expand map signature and add flatMap
Checkpoint non-compiling code for Paul P to take a look at re: changing map to return optional types instead of raw types