Improved support for swefilmer.