Fix two warnings with clang-3.5

Note that the change in fe_values.cc removed a wrong 'if' clause (that always evaluated to true previously) which required re-indentation of the block.