Enums instead of int/String constants (#547)

simplify and add logging

simplify

use == for enum comparison to avoid type mistakes

enum name needs to match previous constant

simplify

Address review comments - formatting, and remove superfluous comment

Shorten DeletePolicy values since not used in settings strings; import enums to reduce clutter

fix whitespace

remove comment per review

address review comment

review comments

remove another superfluous qualification

Last changes