Making 'current' consistently const