dist: Remove copy-pasted code, pass lint-prereqs