Remove trailing spaces and add concrete5 support.