Removing a few 'onevar' statements