[#1117] Remove duplicated helper decorators :/