Simplify translations from the `%cd` syntax

[lukstafi]

At least, remove rendundant wrapping and unwrapping with Some. This is aiming at readability of the translations should anyone check them out for educational or debugging purposes.