Minor change with an eye towards proper handling of extensions.