Modify set_current_user macro and remove current_user macro