Use om/component macro where appropriate.