Maybe fix typename / no-typename problems better.