Addressed comments, used future-print, nicer join'ing, better lint-handling.