Small unnecessary commit.
Several small changes which do not affect the (currently not existing)
functionality.