Cleaning up more 2.6 compatability code snippets.