Tidying of checks made on rhs.