Fix all of the '--i-like-trains'-related stuff.