Align type signatures and fix quoting