Backwards compatibility fix for OC5's p() functions.
Merge pull request #902 from arkascha/master

Restore backward compatibility broken during the last changes.