Removed two dodgy extension methods.