In the meantime, could the necessary html changes be implemented via add_filter?