Removed trailing whitespaces.
Allow to set variant via -DVARIANT.