Unify painkiller usage

Closes issue #1880