Accidentally broke backward-compatibility with refactoring; fixing it.