Various corrections to previous changes implementing separated id- and at-codes.