fireplace loaders cleanup and fixups (bug 854015)