Further clean up the extension methods.