NOTE: Since the CI was signaling mistakes, I fixed them and squashed the individual "fixing commits" into this one.