More W3C validity

Less hard-coded values.