#976: #858: ampersands consistified

opened by thuchacz