clean up symmetries use of base-cases a bit