[declarative] Various style fixes that have accumulated here through time
Reviewed-by: Alexandr Akulich <akulichalexander@gmail.com>