Remove some duplication in companion apply macro