Migrating needed things from the compat-lines file into the lines itself...