Replace some bareword handles with regular variables

Signed-off-by: Niels Thykier <niels@thykier.net>