CP2K: reworked after remarks.