More simplification of signatures