Avoid hasattr pattern - define in __init__() instead (#1694)

Avoid hasattr pattern - define in __init__() instead (#1694) #399