Changed decorator signatures to more closely match the originals.