I'd still like to use vinyl-map here, it'll save the boilerplate as mentioned previously.