Removed dependency on FlexibleInstances extension.