Removed unneeded const and use some fcppt optional functions