Wrap the overridden commands to prevent conflicts

I think it is better to wrap the commands that a user want to override
because if the toString() looks for a function directly on the main
context it could maybe break old formats that use a command's name as a
function.